(vc-maybe-resolve-conflicts): Don't prompt the user.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 26 Mar 2004 16:17:12 +0000 (16:17 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 26 Mar 2004 16:17:12 +0000 (16:17 +0000)
commit6ecd5af4fdea92984d9e297255e676310ffe5691
treec9c06c7b0d3f2b07c088d8e2af214936aa80bef5
parent74cda72c3a5ac5ce24c186ddcc7fbb6a5c07813d
(vc-maybe-resolve-conflicts): Don't prompt the user.
lisp/vc.el